Reset pressed_button to -1 after handling a double click, so that motion

2005-12-20  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkiconview.c (gtk_icon_view_button_press): Reset
	pressed_button to -1 after handling a double click, so that
	motion events occurring between here and the release event
	don't trigger DND.  (#324588, Dave Andreoli)

diff --git a/ChangeLog b/ChangeLog
index ee4815fd69063a394e87b8b810c537d02638a2d8..5878d8d2faf580c63dddca38e45edc37421ef7aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-20  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkiconview.c (gtk_icon_view_button_press): Reset 
+       pressed_button to -1 after handling a double click, so that
+       motion events occurring between here and the release event
+       don't trigger DND.  (#324588, Dave Andreoli)
+
 2005-12-19  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcellrenderer.c: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ee4815fd69063a394e87b8b810c537d02638a2d8..5878d8d2faf580c63dddca38e45edc37421ef7aa 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2005-12-20  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkiconview.c (gtk_icon_view_button_press): Reset 
+       pressed_button to -1 after handling a double click, so that
+       motion events occurring between here and the release event
+       don't trigger DND.  (#324588, Dave Andreoli)
+
 2005-12-19  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcellrenderer.c: 

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index d5b680a7a28010d85613ebe49d221d51b252a207..3e12cab2bf85f1d61f39c1bc2a631e596a05a954 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -1968,6 +1968,7 @@ gtk_icon_view_button_press (GtkWidget      *widget,
        }
 
       icon_view->priv->last_single_clicked = NULL;
+      icon_view->priv->pressed_button = -1;
     }
   
   if (dirty)